From 55fb80266efe5583fe34ac62a93cee55bd30a44b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 17 Apr 2012 15:05:05 +0200 Subject: [PATCH] gnttab: remove pointless NULL check Domains in the domain hash (and hence locatable via the usual lookup functions) can't have a NULL grant table pointer; no other function performs such a check, so remove it from gnttab_prepare_for_transfer() for consistency. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/grant_table.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 04c70388ca..d248c8b2f0 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1390,17 +1390,11 @@ static int gnttab_prepare_for_transfer( struct domain *rd, struct domain *ld, grant_ref_t ref) { - struct grant_table *rgt; + struct grant_table *rgt = rd->grant_table; grant_entry_header_t *sha; union grant_combo scombo, prev_scombo, new_scombo; int retries = 0; - if ( unlikely((rgt = rd->grant_table) == NULL) ) - { - gdprintk(XENLOG_INFO, "Dom %d has no grant table.\n", rd->domain_id); - return 0; - } - spin_lock(&rgt->lock); if ( rgt->gt_version == 0 ) -- 2.30.2